bitkeeper revision 1.1159.212.27 (41f3a67aXzSi2IH-s4Tr3Xrk_85v6Q)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 23 Jan 2005 13:28:26 +0000 (13:28 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 23 Jan 2005 13:28:26 +0000 (13:28 +0000)
commit1210f7fae4a15ab70dd512b3da0237ec253c8011
tree20d3d4d6045b34b01aa7ff1bb674a05b7cb6ec37
parentc742b4cc7fa68e670cfbfb988193d0df5c04bd7e
parent1aedec574bd5393d2c069fb898c56666699ac406
bitkeeper revision 1.1159.212.27 (41f3a67aXzSi2IH-s4Tr3Xrk_85v6Q)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
linux-2.6.10-xen-sparse/arch/xen/configs/xenU_defconfig